<<<<<<<< HEAD:刘洪波/thymeleaf_demo/src/main/java/com/thymeleaf_demo/ThymeleafDemoApplication.java
package com.thymeleaf_demo;
========
package com.chen;
>>>>>>>> b3e6addb04539ce4a13318882db8bc70316bf0fe:陈丽/swagger-study/src/main/java/com/chen/SwaggerStudyApplication.java

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
<<<<<<<< HEAD:刘洪波/thymeleaf_demo/src/main/java/com/thymeleaf_demo/ThymeleafDemoApplication.java
public class ThymeleafDemoApplication {

    public static void main(String[] args) {
        SpringApplication.run(ThymeleafDemoApplication.class, args);
========
public class SwaggerStudyApplication {

    public static void main(String[] args) {
        SpringApplication.run(SwaggerStudyApplication.class, args);
>>>>>>>> b3e6addb04539ce4a13318882db8bc70316bf0fe:陈丽/swagger-study/src/main/java/com/chen/SwaggerStudyApplication.java
    }

}
